diff --git a/board/sandbox/sandbox/Makefile b/board/sandbox/Makefile
similarity index 100%
rename from board/sandbox/sandbox/Makefile
rename to board/sandbox/Makefile
diff --git a/board/sandbox/sandbox/README.sandbox b/board/sandbox/README.sandbox
similarity index 100%
rename from board/sandbox/sandbox/README.sandbox
rename to board/sandbox/README.sandbox
diff --git a/board/sandbox/sandbox/sandbox.c b/board/sandbox/sandbox.c
similarity index 100%
rename from board/sandbox/sandbox/sandbox.c
rename to board/sandbox/sandbox.c
diff --git a/boards.cfg b/boards.cfg
index b01672d..da7a0db 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -1183,7 +1183,7 @@
 Active  powerpc     ppc4xx         -           xilinx          ppc405-generic      xilinx-ppc405-generic_flash           xilinx-ppc405-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC                                                    Ricardo Ribalda <ricardo.ribalda@uam.es>
 Active  powerpc     ppc4xx         -           xilinx          ppc440-generic      xilinx-ppc440-generic                 xilinx-ppc440-generic:SYS_TEXT_BASE=0x04000000,RESET_VECTOR_ADDRESS=0x04100000,BOOT_FROM_XMD=1                                    Ricardo Ribalda <ricardo.ribalda@uam.es>
 Active  powerpc     ppc4xx         -           xilinx          ppc440-generic      xilinx-ppc440-generic_flash           xilinx-ppc440-generic:SYS_TEXT_BASE=0xF7F60000,RESET_VECTOR_ADDRESS=0xF7FFFFFC                                                    Ricardo Ribalda <ricardo.ribalda@uam.es>
-Active  sandbox     sandbox        -           sandbox         sandbox             sandbox                               -                                                                                                                                 Simon Glass <sjg@chromium.org>
+Active  sandbox     sandbox        -           -               sandbox             sandbox                               -                                                                                                                                 Simon Glass <sjg@chromium.org>
 Active  sh          sh2            -           renesas         rsk7203             rsk7203                               -                                                                                                                                 Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>:Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 Active  sh          sh2            -           renesas         rsk7264             rsk7264                               -                                                                                                                                 Phil Edworthy <phil.edworthy@renesas.com>
 Active  sh          sh2            -           renesas         rsk7269             rsk7269                               -                                                                                                                                 -